Fix issue #5
Fix issue #1
Merge pull request #6 from yyjdelete/master

Try Fix issue #1 and issue #5