Handle commandline

fixes issue #6