Added option handling to command line interface.
Merge branch 'master' into dev
p4500 is now an executable.