Merge pull request #14 from ChrisWiegman/dev

Thanks!