Preparing for 14.04

Preparing code for 14.04