Added reading properties from a file (not working entirely yet).
Merge remote-tracking branch 'origin/master'