adding timers
fixing parasails output
Merge branch 'master' into uniform_probability