Merge pull request #14 from ChrisWiegman/dev

Thanks!
Merge pull request #15 from JeffMatson/dev

Merge pull request #14 from ChrisWiegman/dev