More 2.0 keywords.
Merge pull request #3 from jotomo/master

More 2.0 keywords.