Same deal, less syntax errors
Merge pull request #25 from StafDehat/working

Same deal, less syntax errors