Merge pull request #141 from causten/s4c4

pulled in bugs fixes for sprint 4