Merge pull request #65 from arthurwolf/edge

Edge becomes master
Merge branch 'release/0.1'
Merge branch 'master' into edge