Merge pull request #11 from LinZap/master

2014/03/11