Added version file
Merge branch 'master' into develop