Bugfix of r8

With this Pull Request the issue
 * #8 and
 * #7
cannot reproceud and are fixed. Only one of the documented issues (#7) occours.