design!
more design!
Merge branch 'dev' into maj-dev
Merge pull request #7 from exfm/maj-dev

Maj dev