Use new frame_id parameter
Rollback changes to fix #148
Merge pull request #172 from DLu/hydro

Final Fixes before Release