Fixes Bugs
Merge origin master
Clean up
Merge branch 'staging'