Switching from 'thin' to 'unicorn' - issue #25