Develop

Merge minor bug fixes and enhancements into master