Updated to optionally build or build then run