Merge pull request #5 from daltondan/master

merge