Quick sapling fixes
Merge pull request #24 from chylex/master

Quick sapling fixes