Fixes #238 - Toolkit design problem
Merge branch 'production'