Merge pull request #37 from DevenSmith/master

shh just accept my merge
dkjslkf
Merge remote-tracking branch 'upstream/master'