Fixed issue #80.
Merge pull request #81 from quietshu/master

Fixed issue #80.