Finishhh azt
Merge branch 'lmaresz2'
fix bug, for realz