Issue 135

Tests included