Merge pull request #1 from fyounis/master

I committed to my forked rep and now I want to pull into you repo with my changes.
testinggggg
Merge pull request #2 from TeaYou/master

Hello Regis
Pulling Vitor's file in

Seeing if forked works on Victor's changes
pulling in file

from Victor's changes