Merge pull request #3 from adamdriscoll/dev

Dev