Added command line arguments (Fixes #13)