Fixes #57, #64, #68