fixes #40, catching nested requires properly
Merge branch 'fixes40', remote-tracking branch 'origin'