Merge pull request #1 from tavaron/master

cross fork pull
Merge pull request #2 from tavaron/master

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

Merge pull request #1 from tavaron/master
Merge pull request #15 from nonkelly/master

No forks anymore!