Merge pull request #1 from chjost/master

Changes mainly to ReadWrite concerning momentum
test