Issue 121

This should solve issue #121