Merge pull request #1 from tavaron/master

cross fork pull
Merge pull request #3 from nonkelly/patrick

Merge pull request #1 from tavaron/master