Merge pull request #1 from simolayton/master

pull
Merge pull request #2 from simolayton/Branches

Merge pull request #1 from simolayton/master