Merge dev --> master for 1.0.1 release