Develop

Merge latest bug fixes into master