Issue #509 fixed
Merge pull request #511 from WellingGuzman/issue-509

Issue #509 fixed