Devel

Merge of developer and master branch