done issue #33 and #34