Merge pull request #13 from bradbishop/perf

More performance improvements