Merge pull request #212 from maksimov/2014.05

2014.05
Merge pull request #215 from maksimov/2014.05

Constructor was not setting port; Also should not return ArrayList but L...