#221 fixed #169 minor changes