resolves issue #1316
Resolves issue #1383
Merge pull request #1549 from wdwvt1/issue_1316

Issue 1316 and issue 1383