Updating recent changes for port assignment
Merge pull request #4 from ypwalter/20Jun2014-1600

Updating recent changes for port assignment