Merge pull request #104 from Sponk/development

Merge development into master
* Updated version number
Merge pull request #107 from Sponk/master

Updated version number