Implemented command line options. Closes #21