Merge branch 'develop' of http://github.com/proggy/cheb into develop
Merge branch 'develop' of http://github.com/proggy/cheb into develop