Updated to work with ubuntu 12.04.5