mts-lucas Merge pull request #2 from mts-lucas/version-2