v1.0.1.47 - fix #2 and #4 of Ticket #262