Closes #1761
Closes #1744
Closes #1747
Updated Version 3.0.4