Updated with commander.js