Minor changes and instructions for building on Ubuntu