Performance optimization
feature #94 Performance optimization (annesosensio)

This PR was merged into the master branch.

Discussion
----------

Performance optimization

Commits
-------

11debc8 Performance optimization