Merged changes from rob branch