issue #22
minor changes