Adding support for /m. Resolved #3