more changes to this poor file
Merge pull request #3 from RobFone/newbranch

more changes to this poor file