Added "unique" attribute to field.
Bug fix.
Cleanups.
Merge branch 'master' into gh-pages