Merge pull request #30 from NFLabs/make_ci_green

Make CI Green