Merge pull request #217 from orbea/cue