Clean up
Merge pull request #70 from zborboa-google/patch-3

Clean up