Merge branch 'release/1.0.1'
Include build/
Merge branch 'master' into dev