Closes #1741
Closes #1742
Merge branch 'issue-1742'
Updated Version 3.0.1