Resolved issue #100