Merge branch 'develop' of github.com:KuelapInc/teller into develop