portString no longer used
Merge branch 'dev'