Merge branch '0.1'
Fixing package name
Merge branch 'master' into 0.1