Issue 4
Merge pull request #9 from Yili-Jiang/master

Issue 4 - merged