RBT 1: Added stuff.
Merge branch 'master' into rebase-test
Merge pull request #4 from adaptable/rebase-test

Rebase test