Bug fix
Merge pull request #28 from smiling-Jack/master

Bug fix