Updated to 0.1-dev
Merge pull request #16 from maclovr/develop

Updated to 0.1-dev