Fixes issue #96 #97 #98