Cleanup sets and dictionaries problems
Merge branch 'master' into gh-pages