Implementation of Issue 98

This one is a biggie :).

Hope it will be fine thou :)