updates
Merge branch 'happy' of https://github.com/henchill/Preggo into happy