Fixing issue with generating version number in the rakefile
Merge branch 'develop'