Simplified command line parsing
Updated dependencies