Merge pull request #2 from mjyc/master

updated