Issue 166

This should resolve issue #166