Issue127

Hope this is good enough.