Merge pull request #381 from dbaio/master

Changes Zabbix-2 Agent