pushing changes from Thursday
Merge branch 'master' of https://github.com/lmbneves/roost