Merge pull request #45 from jimsch/master

First pass at reducing memory usage