More WIP for initial release
Merge pull request #4 from andylyall/master

More WIP for initial release