Issue 134

Closes #134