Initial commit
Updated version to 0.0.4.dev
Merging