Fixed issue #39 and partial #20