Merge pull request #4 from amychiu/development

network stuff