Take into account different markup in 2.1
Fix typo and version bump