Merge lusis master

Supercedes #10