Issue 146

This should solve issue #146