Bump version number

Closes #29
Refactor, cleanup some logic
Merge pull request #30 from frewsxcv/cleanup

Refactor, cleanup some logic
Merge remote-tracking branch 'upstream/master'