Bumped to version 2.1
Aligned to wai-3.0