-Adding a command-line util
-Small fix in case no args are given