Cleaned up code
Merge origin/master
Merge origin/master
Merge origin/master