Merge pull request #427 from kbingham/version_fix