Some small changes

As requested in commend to #99, here a clean pull-request.