Up

Hey Tomek,

here are some changes. Feel free to integrate some changes or to discard them.
The Export-Functionality is already implemented but still needs some tests.

Best wishes
Alex