Develop

Merging in develop branch and tagging a new release