changed things
Merge pull request #1 from mer8/fonso

changed things in a good way