Development

First merge of devel and master branch