Made som improvements suggested in issue #70