Updates
Merge pull request #60 from apeniche/master

Updates