Merge pull request #5 from roacobb/master

Updates