Issue 76

This is a merge request for bug #76