Fix issue #95
Merge pull request #112 from alexander-zimmermann/next

Fix issue #95