Merge pull request #22 from lambdanaught/dev

Refactoring
Updating version.