Merge pull request #22 from bakercp/gsoc

CI
Can't return in a void function.