fixed #206 #202
Merge branch 'master' of github.com:jeena/Bungloo