Merge pull request #110 from olerem/clean-2016.11.02