PN: Updated algorithm, closes #4
Merge branch 'master' of https://github.com/Synion07/agile-course-may-2013