Merge Master into Develop

Resolves #8