Seems to work after triple merge. Fixes #60 #60 #56