Fixes #9

usage() is now called correctly and catching of arguments should be better