Fixes #570
Merge pull request #13 from linyudong/master

Fixes #570