Added --dev support (HT: @wizonesolutions)