Fixed race condition and added command line target