Merge branch 'master' of github.com:comtesacristain/ozmin_cleaner