Merge pull request #69 from 2betop/master

Any thing?
Merge remote-tracking branch 'upstream/master'