Added unicorn
Merge branch 'release/20140809-02'