Added timestamp version and option to stop before build