Merge pull request #5 from MicheleSr/devel

Devel
Merge pull request #6 from MicheleSr/develop

Develop
Updated Makefile
Merge pull request #7 from MicheleSr/master

Merge