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