Issue #63 implementation

Simple way to implement #63