#8 bug fix
Merge pull request #9 from rickytan/master

#8 bug fix