Merge pull request #49 from bhewett/Dev

Dev