Updated to use Ubuntu 14.04
Merge pull request #1 from alej0varas/master

Updated to use Ubuntu 14.04