Merge develop to master for 0.9.1