resolves #68
Merge pull request #69 from landongn/master

resolves #68