Update for 1.048.020
Merge remote-tracking branch 'upstream/master'
Fix for issue #151
Fix for issue #146
Fix for issue #153
Merge pull request #166 from Commander-Scott/master

Fixes for issues #146, #151, #153