Add method to parse command-line.
Merge branch 'master' of github.com:abenson/puerto