Changes made to run on Ubuntu 14.04