Resolved issue #70