Merge pull request #9 from sssonline/master

9
Merge remote-tracking branch 'upstream/master'