Issue42

Fixes Issue #42