Merged changes from master for version 0.49