add -m and make it work on 2.6 through 3.4