Merge branch 'master' into mbm-redesign
Created an atom for xfminvert.

Closes #73.
Merge branch 'mbm-redesign'