Merge pull request #211 from jcookems/dev

Dev