Merge develop to master for version 1 release.

See most recent commit for details.