New features, improvements and bugfixes

Brings in all the new changes and feature implemented during the last weeks.

It's still work in progress though.