Initial commit
Merge branch 'release/0.0.1'
Cleaned Up Merge Conflicts when Synchronising Branch
Merge branch 'master' into develop