TBR http://codereview.appspot.com/5712052/. Fixes issue #111.
2 files changed