Adding in logic for #240.
Merge branch 'master' of https://github.com/int3/doppio