Merge pull request #1 from crenwick/dev

Dev