tidy build. fix break.
Merge pull request #109 from twitter/feature/fix_err

Fix & Tidy Build