Develop

Pulling stable state into master before doing large refactor in develop branch.