added 1.2 functions and better highlighting
Merge pull request #1 from moshee/master

Added 1.2 functions and better highlighting