Resolved issue #26 and #29