Merge pull request #79 from cyrille-leclerc/master

Add System Property configuration in addition to System Environment variables
Merge pull request #3 from scobal/master

merge