merge PR #80 Several changes - see description