Fixed path to be more intelligent
Added option parser