Merge pull request #11 from StanTwinB/develop

Update to new beta 3 syntax
Merge pull request #2 from mattdonnelly/develop

Merge pull request #11 from StanTwinB/develop