Merge pull request #1 from jherrlin/master

Add Code