Removed a file and prepared code for release.
Merge branch 'develop'