merged changes from wizkid057

merged changes from wizkid057