Resolved issue #113