Cleaned up some code
Merge remote-tracking branch 'origin/development' into development