- Added Youri as author.
- Added todo 2.
- Some small changes: Javadoc, method name, signature, and line length.