Merge pull request #1 from crenwick/dev

Dev
Merge pull request #2 from crenwick/master

Merge pull request #1 from crenwick/dev