Merge pull request #2 from welldefinedvariables/master

Merge pull request #2 from imAlan/master