mingjerli Merge pull request #17 from mingjerli/iss14