Merge pull request #25 from alexander-zimmermann/next

Clean up usage and option parsing