Merge pull request #11 from jonavargas/master

ok
Merge pull request #13 from jonavargas/Bryan

Merge pull request #11 from jonavargas/master