Merge pull request #302 from thewacokid/master

Regression tests all complete successfully and builds complete without warnings.
Merge pull request #304 from thewacokid/master

Reduced memory usage slightly during open -- passes regression tests without fault.