Merge branch 'fixarray' into 'master'

Fix the port forwarding which should be returned as an array

See merge request !42