Merge pull request #1 from exfm/maj-dev

Maj dev
Merge branch 'dev' into maj-dev