Merge pull request #2 from theodi/master

More read capabilities
Merge pull request #10 from xmacinka/master

Upstream changes