Update to 6.0.1
Merge pull request #1 from guersam/master

Update to 6.0.1