Merge pull request #12 from dewguzzler/master

sample pull request