Added commandline configuration
Committing the remaining changes for a first 0.1 version