new stuff.
Merge branch 'master' of github.com:jwang93/test-druid