Added command line arguments
Merge pull request #1 from matiasleidemer/master

Added command line arguments