Fix for #1084
Fix for #1216
Merge pull request #1217 from ghost1227/master

More updates for 1.6