Merge pull request #96 from wilke/master

Reduced memory footprint reading from file