Refactor example
Add Tests
Bugfixes
Extend Doc