Attempt at fix 2.
Merge branch 'master' of github.com:NEricN/PISI-Reader