squashing merge
Merge pull request #418 from rashidkpc/fix

Bringing the rest of spencers changes in