Issue 80

Fix for Issue#80