Merge of development and master branch