Added element implementation
Fix offset calculation
Bump version to 2.1.0