fixes issue #93 (for real, this time)
Merge branch 'master' into predsim