Merge pull request #643 from jcookems/dev

Dev