Merge of develop

A test of pull requesting.