fix #138 Part 1
Merge branch 'dev' of https://github.com/alexhenning/wpi-suite-tng into dev