Updated main file

Hi Odepia,

I updated my main file with a few of your changes.
Thanks for forking.