Address issues from #347
Merge pull request #353 from andrewcollette/issue_347

Address issues from #347