stuff and things
Merge pull request #1 from jimmont/jimmontfeat

stuff and things