misc fixes
Merge branch 'master' of github.com:go4and/lib
Merge branch 'master' of github.com:go4and/lib