Develop

Merging changes of develop to master