adding contexts
Merge branch 'master' of https://github.com/kjin/Ribbons