Merge pull request #51 from AADOJ/develop

Develop
Merge pull request #69 from AADOJ/bjorn2

Bjorn2
Merge pull request #70 from AADOJ/develop

Develop
change