WIP
Import work
Change version to 0.0.1
Merge pull request #2 from grena/develop

Import initial work