Fixed issue #53 issue #30