Fix #95.
Merge pull request #113 from crazy2be/issue95

Fix #95.