v1.0.0.10 - attempt to fix Ticket #193,#198,#209