Merge pull request #157 from arknoll/2.x

Beginning of 2.x branch