My fixes
Merge pull request #1 from testaccount89/myfixes

My fixes