Mafio master

merging updates from @mafio