Refactored according to change request on mailinglist and meeting on the 4th of july 2014