Please check, whether these changes are acceptable in terms of computation overhead.
Closes #33 (closed)