Merge pull request #67 from fnva/master

Cleaning Project