Merge pull request #41 from joeelsey/dev

Dev