bugfixes
Merge branch 'master' of https://github.com/ecastillo550/hwfinal