Issue 66

Fix for issue #66