new feature
Merge pull request #2 from jonchiu/iss53

new feature