Patches for Issues #254 and #255
Merge pull request #311 from gitcac/issues-254-255

Patches for Issues #254 and #255