merge

Merging Brian's changes into the forked repo.