Merge pull request #9 from malavolti/master

Some changes
Merge pull request #10 from malavolti/master

Submodule update