Issue 245

This should solve Issue #245.