Updated and improved for Ubuntu 14.04