Really fixes issue #18 and #20