Issue 135

This should solve issue #135