Merge pull request #10 from lat-lon/master

Bugfix of r8