Merge pull request #106 from olerem/clean-2016.10.15