Fixes #90, #95 & #96