Update code for ubuntu 14.04