made code compatible with 0.8
Merge branch 'url' of github.com:admc/wd into url