Added individual position calculation
Merge branch 'master' of github.com:tonklis/barrios