Merge pull request #19 from jsrain/master

forgotten version
Merge remote-tracking branch 'upstream/master'