Issues #252 - #291 Fixes
Merge pull request #296 from gitcac/issues-252-291

Issues #252 - #291 Fixes