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

Conflicts:
	example.php
Merge branch 'master' of https://github.com/malenkiki/bah