Merge pull request #5 from living180/master