Versions and repo handling improved
Merge pull request #14 from jaceklaskowski/versions-improved

Versions and repo handling improved