Issue 140

Builds on #144