Issue 114

This should solve Issue #114