implements #10

This pull request should implement #10. Could anybody please take a look if that works?