Fixes #69, Fixes #67