Fixed command line handling

Now it is possible to specify the target goal (part of issue #12)