Linea XD
Merge pull request #31 from mackk/master

Mauro update