Alex

Update master to reflect all changes to branch alex