Merge fork into UCFCDL gh-pages