The master branch has undergone some serious refactoring.
to not loose the great work from this years GSOC, we need to rebase from master