Issue 147

This should solve issue #147