misc
Merge pull request #18 from ryanstorberg/master

misc