Merging Brian's changes into ASEE fork