bug #8 fixed
Merge branch 'master' of https://github.com/lastroom/yama