Fix #101

Adds the functionality requested in Issue #101