Updated version number
Merge pull request #33 from etothepii/mergeIntoMaster

Merge into master
Merge pull request #34 from etothepii/master

Bumped version number