Merge futher fixes for issue #463
Added change log from 1.1