Checked in the phone, corrected the errors and made some improvements for better appearance
Merge pull request #16 from gaich/patch-4

Checked in the phone, corrected the errors and made some improvements fo...