Jamespo - 2017-09-01

Here's a patch to add -m flag to support that:

https://gist.github.com/jamespo/b7494bfc6482a9d2fbc0d4689a49e6e9