Merge pull request #251 from barche/master

Restart file format changes
[MERGE] Floating point rounding fix
[FIX] Broken test