Fixed Issue #32.