Fixes #259.
Fixes #202.
Merge pull request #260 from AshFurrow/perf

@1aurabrown => Performance