Switch to variables to allow Ubuntu 12 support
Merge pull request #1 from wolf31o2/master

Switch to variables to allow Ubuntu 12 support