Clean up
Merge pull request #92 from zborboa-google/patch-6

Clean up