Merge pull request #7 from exfm/maj-dev

Maj dev