gem update and specs fix
merge fix