Merge pull request #14 from nonkelly/patrick

Patrick
Merge pull request #20 from tavaron/patrick

Merge pull request #14 from nonkelly/patrick