fixes #2
Merge pull request #3 from marc-ferrer/master

Merges current work