Issues #275 #277
Merge pull request #288 from gitcac/issues-275-277

Issues #275 #277