Issue #157

Add test