Merge pull request #117 from Particular/develop

Merge Beta 2 version into Master
Merge pull request #118 from Particular/master

Merge pull request #117 from Particular/develop