Adding changes from master

adding changes from master