Merge pull request #8 from Gerry1135/fixtweaks

This is how I would have made the tweakables optional
Packaged for 0.6.2.9.
Merged v0.6.2.9 from upstream