Fixed issue #32
fixed issue #5
Issue #14 try