Merge pull request #7 from brint/master

Adding 14.04 support