Issue1

Fixes  #1 at least partially.