More variables
Merge pull request #20 from kmodlich/patch-15

More variables