ready for pull request
Merge branch 'dev' of https://github.com/isaklilja/version1.git into dev