cleaning things up
Merge origin/master