Merge branch 'alpha-0.1'
Merge branch 'master' into alpha