Update to be compatible with Ubuntu 12 and newer
Merge pull request #1 from alchen99/compat12

Update to be compatible with Ubuntu 12 and newer