Travis CI
Merge branch 'develop' of https://github.com/malenkiki/bah into develop