multiple updates addressing issue #108, #141, #136 and #142