Resolved issue #3. See changelog