Closes #1871
Closes #1875
Updated Version 3.1.2