fix for issue #105
fix for issue #106
fix for issue #107
fix for issue #110
fix for issue #114
fix for issue #116
fix for issue #117
fix for issue #118
fix for issue #119