latest develop from Jannis

@jezdez : thanks!