Created by: Ueland
This fixes bugs and suggestions from #257 (closed) and via other PR and on email directly to me.