Submitting bugfix
Merge pull request #310 from lcb931023/master

Submitting bugfix