Issue127

Hope this is good enough.
I'm open for discussion, as always :)