Merge pull request #7 from living180/master