Removed usage() which can be very misleading
Merge branch 'master' into msr