Some changes
Merged remote master changes