Committing

FIXES #7
Merge pull request #8 from barosl/master

Committing