Fixes #54 #50