Merge pull request #187 from moiseev/new-integer-protocols

Upgrading to the new integer protocols