Adds the code from version 2.0.1