Merge pull request #4 from dd508/master

should we combine