Better command handling
Merge branch 'msr' of github.com:fgaud/Miniprof into msr