Merge pull request #37 from olerem/clean_2