Fixes issue #20 and improved #11