Fixes #110, Fixes #133