Issue 76

This is for issue #76