Added some commandline parsing