Merge tag '1' into develop

Tagging version 1 1
Merge pull request #2 from phillipbroberts/develop

Merge tag '1' into develop