Merge pull request #1 from LinZap/master

fef