DanielDe Merge pull request #106 from kjmatsuda/topic/add-controls-plain-lists