Merged lastest changes