this is new
new things
resove conflicts
Merge pull request #2 from dariodaprile/master

new merge and other stuff