Fixed issue 7
Merge pull request #16 from cliu314/master

Fixed issue 7