Merge pull request #11 from jonavargas/master

ok