Updates
Merge pull request #57 from apeniche/master

Updates