Fixes #20.

Change-Id: Ibb656662146f44b82e1589d2195d3348ec4980aa
Reviewed-on: https://code-review.googlesource.com/2342


Reviewed-by: Paul Wankadia <junyer@google.com>