Fix issue #5
Fix issue #7
Fix issue #8
Fix issue #9
Fix issue #10
Fix issue #11
new patch