Merge pull request #26 from exfm/maj-dev

Maj dev