Corrected minor details
Corrected EIO bindings.
Merge branch 'master' into devel
Merge remote branch 'origin/devel' into devel