Merge pull request #2 from hobbyquaker/master

merge
Lost Commit
Merge pull request #101 from smiling-Jack/master

Lost Commit