(master) fixes issue #14