Merge pull request #154 from parkouss/master

fix minor issues