merge a set of changes for speed improvement and better reproducability #9

Closed lutzfischer closed 7 years ago