Issue #36

Ben Grimes