pulled changes from master
fixed conflicts in merge