Merge pull request #12 from LinZap/master

03/23