Fixes #28

Increases performance, decreases package size.