Merged latest changes from Sebastiii