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

Updated to 0.1-dev
Merge remote-tracking branch 'origin/develop'

* origin/develop:
  Updated to 0.1-dev