Merging to master for the v1.0.1 release