fixed arg parsing bug in simulate, bumped version
Merge branch 'develop' into rate