May fix, maybe, #203. bjmcmorran
Merge pull request #229 from alexbragdon/feature/Iteration-6-dev-issue-203

May fix issue 203, looks good