Merge the development and master branches

Merge the development and master branches