Source code refactory
Merge branch 'master' of github.com:rgv151/reader