Pull jdodson/zemus changes into travisnewman/zemus

Assuming I'm doing this right.