Merge pull request #16 from grappler/develop

Removes trailing spaces and tabs