Initial version
Merge https://github.com/seproj/v0.1