Comments finished, some magic numbers. Only README left
Merge remote-tracking branch 'origin/master'