fragments from Francesco
Merge pull request #56 from dnash86/master

fragments from Francesco