Issue 141

This should solve Issue #141