Applied the changes which were suggested by @tleyden . #362