Performance

Issue #14