Modified reader structure. Some bug fixes.
Merge branch 'master' of https://github.com/stenvala/dp