Minor bugs fixed
Merge branch 'master' of https://github.com/worgock/rug