Merge branch 'steven' into development
Merge branch 'steven' into development
Minor adjustments
Merge branch 'development' into steven