Issue#188#187#196

resolves #188
resolves #187
resolves #196