Merge pull request #1 from jherrlin/master

Add Code
Merge pull request #2 from jherrlin/with_code

Merge pull request #1 from jherrlin/master