asdf
resolves conflicts
Merge branch 'master' of https://github.com/mbourqui/iod
fixes bugs