whitespace and code style issues
Merge pull request #36 from lavoiesl/whitespace

whitespace and code style issues