Issue 145

This should solve issue #145