Fixes #19 not really but that was the open issue ;-)