Merge branch 'version-flag-0.1-beta'