Fixed compilation in Ubuntu, releasing 2.0 beta