Bug Fixes and Major Changes
Merge branch 'Development'