Merge pull request #7 from XhmikosR/master

Multiple updates.
Reformatted `var` statements to follow one-var-per-line rule.