fixed Nick's mistakes
Merge branch 'master' of https://github.com/hcuri/Team5