Fixed issue #29 and working on #25