Updated for Ubuntu 13.10