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

Clean up