Issue 130

This should solve issue 130