bug fixes. optimization. better testing
Merge branch 'master' of github.com:rexposadas/simulate