rebased
+1
Will have to fix the test, but I will merge after that :)
Pull-Request has been merged by jkaluza
:thumbsup: