Issue #31. Fixed