Merge pull request #53 from Kekun/fix/set-controller-port-device