Updated to work with Ubuntu 13.10