Merge branch 'master' of https://github.com/zzcoder/curator into CURATOR-224