Merge pull request #3 from eduncan26/master

pull to master to branch