Merge pull request #36 from elyotli/better-keywords

Better keywords
wip backbone
Merge branch 'master' into backbone-construction
Merge pull request #37 from elyotli/backbone-construction

Backbone construction