Fixed #9
Merge branch 'master' of https://github.com/cloudezz/houston