Add whitespace.
Added back missing features from PR.
Merge pull request #14 from bakercp/gsoc

Continued Integration