Merge pull request #13 from ChrisWiegman/dev

Thanks!  Saved me a ton of time!
Merge pull request #15 from JeffMatson/dev

Merge pull request #14 from ChrisWiegman/dev
Merge pull request #17 from JeffMatson/dev

Merge from dev
bugfixes and security
Merge pull request #18 from JeffMatson/master

Merging to dev branch