Merge changes from jpeterbaker/maxfield