Merge pull request #3 from danielm59/master

updates