Arash: clean_save commit
Merge branch 'master' of https://github.com/timmwagener/helga