Updates
Merge pull request #62 from apeniche/master

Updates