Issue 304

This should solve Issue #304.