Changes of @doodeec merged