fixes #15
Merge pull request #18 from marc-ferrer/master

fixes #15