Merge pull request #4 from hartym/dev

-> mainline
Towards 1.0.0a6 release.