Fixing master
Merge pull request #392 from jtorrente/fix-master

Fixing master