Karamooz filed some "contributions".
Merge pull request #316 from mikeubell/master

Karamooz filed some "contributions".