Cleanup.
Add flags for OpenBSD.
Merge branch 'master' of https://github.com/S010/test