Updated to merge with Juan's commit
Merge branch 'master' of https://github.com/sjyk/sampleclean-async