issue #63
minor fixes