Merge pull request #2 from parcon/master

update for your code~