updates and fixes
Merge branch 'master' of https://github.com/mikehenriquezf/mupr2014