Merge pull request #12 from rojotic26/develop

Develop
Merge pull request #13 from rojotic26/develop

Develop
Merge pull request #14 from rojotic26/develop

Last merging
Merge pull request #15 from rojotic26/develop

Develop
Merge pull request #16 from rojotic26/develop

Develop
Merge pull request #17 from rojotic26/develop

Develop
Merge pull request #18 from rojotic26/master

Develop