Fixed issue #122
Merge pull request #171 from xwang12/master

Fixed issue #122