About Fixes
Merge branch 'master' of github.com:ccavazos/hack-until-it-hertz