This fixes #21, resolves #22
Merge branch 'master' of git://github.com/zaunaf/xond