Merge pull request #1 from sladeware/master

pull sladeware:master updates into etheon's fork
fix small typo in a comment
Merge pull request #23 from etheon/master

fix small typo in a comment that is angering my editor