Merge pull request #1 from tlicata/master

tim likes spaces
alex likes to rename his methods in wild ass ways
tim likes spaces in parameter lists too