Merge pull request #5 from 1099proinc/dev

6
Merge pull request #13 from 1099proinc/dev

stuff
Merge pull request #17 from 1099proinc/master

asdf