Added dgonyeo's bug fix
Merge pull request #301 from dgonyeo/master

Added dgonyeo's bug fix