Merge branch 'release/0.0.2' into develop
Merge branch 'refs/heads/master' into develop
Fix reg ex again
Merge branch 'release/0.0.3'