Some refactoring.
Refactor
Merge branch 'develop' of https://github.com/morganbengtsson/Micro-reader into develop