Added the latest revisions to 4.1.0, added tests.