Changes to support Ubuntu 14.04
Merge pull request #1 from bellycard/14-04

Changes to support Ubuntu 14.04