Merge pull request #10 from rhyolight/master

travdsdf
Merge remote-tracking branch 'upstream/master' into test5