Patches for Issues #274, #280, #281
Merge pull request #283 from gitcac/patches-274-280-281

Patches for Issues #274, #280, #281