Issue #1456 - Bringing e234fcb up to date
Merge pull request #1499 from ghost1227/bugs/1456

Issue #1456 - Bringing e234fcb up to date