Many changes described by issue #62