Merge pull request #5 from good2000mo/master

aaaaaaa by good2000mo
ccccccc by comus
using theirs
Merge branch 'comus-master'