Issue#186

resolves #issue186
resolves #issue183