some fixes
Merge branch 'master' of github.com:k2m30/genko