Merge pull request #412 from colemanw/versionCheck