Simulation mode needs -c argument
Merge branch 'mergerx'.