Added more macros
Fixed regexp for variables
Addes comment block