Merge pull request #1 from serialhex/master

Small request
Merge remote-tracking branch 'upstream/master'