Merge pull request #12 from tavaron/patrick

Patrick
Merge pull request #1 from tavaron/master

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

Patrick