Fix for #84
Fix #83
Fix-for-#85
Merge remote-tracking branch 'origin/Fix-for-#83'
Merge remote-tracking branch 'origin/Issue85'