Merge pull request #15 from exfm/maj-dev

Maj dev