Merge pull request #286 from pgreyson/master

Integrate with controller REST API