Bug fixes
Merge branch 'master' of https://github.com/david-batic/peer-project.git