foobar
Merge pull request #1787 from tomincolo/tomincolo

Merging PR from @tomincolo