Added code revisions from version 2.1.0