Fixed issue #44 (and also #30 since it's now obsolete)
Merge branch 'developer' of github.com:djkirby/wpi-suite-tng into developer