Added proper version handling and tests
Merge pull request #4 from solarkennedy/version_fix

Added correct version handling and tests