Merging in changes from bfirsh/loom