Merge pull request #8 from rmed/master

Updated ZAM version in config file
Merge remote-tracking branch 'upstream/master'