Update gems
Merge master
Correctly generate ids
Update tests