Update with support for ubuntu 14.04