Improved cmd option behavior :D