Updated some info about Marconi
Merge pull request #16 from FlaPer87/master

Updated some info about Marconi