Fixes #154, Fixes #155