Various fix
Merge pull request #3 from Valerio88/master

Various Fix