Merge pull request #16 from LinZap/master

0512 merging