Added more variables
Merge pull request #2 from rmeertens/master

Added more variables