Issues #159, #173
Merge pull request #184 from gitcac/issues-159-173

Issues #159, #173