cleanup and some other modification
Merge branch 'master' of https://github.com/heikkipesonen/reader