fixed a BIG bug!
Merge branch 'master' of https://github.com/ihenria/3202g2