fixed some cascading issues
Merge branch 'master' of https://github.com/MichaelMusgrove/Peppermint