Updated to support Ubuntu 14.04