few things
Merge pull request #37 from ryanricig/master

Changes