Rework property loading

Fixes issue #21
Merge pull request #22 from philipwhiuk/hotfix-propertiesFile

Rework property loading