Merge pull request #2 from LinZap/master

ok mer