Develop

Merging develop into master with #61