Fix recursive issues
Merge branch 'master' of github.com:apexskier/wombat