Optimized.
Added. Fixes #77.