new Dev branch after conflict
Merge pull request #186 from FWAJL/dev

new Dev branch after conflict