portability improvements
Merge branch 'master' of https://github.com/h4mu/rott94