featuremx1 to master

previously merged into release 1.0