Fixed issue #52 and #55