fix #2
fix #1
Merge pull request #6 from jpjp84/iss2

fix #2
Merge pull request #5 from minjiyang/iss1

fix #1