Prepare release
Improve markup
Merge branch '2.0'