Merge pull request #5 from LinZap/master