* improved parsing command line arguments
* changed format of command line arguments
* bugfixes