Latest bugfixes
Merged all features