fixes to compile in linux
Merge pull request #1 from jtorresfabra/master

Fixes to compile in linux