Merge pull request #21 from ndynan-gp/ndynan

Ndynan
Merge branch 'master' into ndynan
Too many changes