Performance tune-up.
Syntax changes.
Removed pointless makefile.
Merge remote-tracking branch 'origin/master'