Merge pull request #16 from atengler/fix-master-ip

Fix MASTER_IP issue