Initial 0.11 stuff.
Fixores.
Fixes to make it work with final 0.11
Merge pull request #27 from xi-project/0.11

0.11