stash
Merge pull request #150 from ActivityRez/chris-fixes

Chris Fixes