Fixed compilation on Linux.
Pulled changes.