Merge pull request #64 from brentthorne/dev

Dev