Merge pull request #43 from bhewett/master

Bad Merge Removal