Map port

Changes for issue #7