FIx for tyler
Merge branch 'master' of https://github.com/brendonbeebe/dreamer