Merged few changes from master