add two new options
clarity
merge
Merge branch 'master' of github.com:nhoening/StoSim