Closes #1739
Fixes typo of issue #1738
Closes #1738
Closes #1736
Closes #1735
Closes #1733
Updated Version 3.0.2