Develop

Merging in stable version of application