Updates
Merge pull request #59 from apeniche/master

Updates