Merge in latest updates from Alex (#3)