related to #10 and #7 I'm opening this as a separate issue from #10 , I will probably work on this later (when I need it) but if someone else wants to do it, be my guest ;)
