Merge pull request #313 from schodet/f2-memory