#208 fixed #171 minor updates