Toolbox bugfix #38

Merged
merged 4 commits into from Sep 26, 2012