added variables support
bugfix
refactoring
bugfix
bugfix
finished math support