Machinist2

In reference to https://github.com/MarkUsProject/Markus/pull/784
Merged master and replaced occurrences of `.make` with `.make!`