Issue 63

Implementation of issue #63