Merge pull request #117 from Particular/develop

Merge Beta 2 version into Master