Resolving exmark

Fixes #149, 153