Merge pull request #46 from jrozner/master

Fix SCons bugs