Fixes https://github.com/adrianaisemberg/CLAP/issues/23
Merge pull request #24 from georgiosd/master

Fixes https://github.com/adrianaisemberg/CLAP/issues/23