Made some fixes to the App.
Merge branch 'master' of https://github.com/WallyGuzman/PLI.git