Updated to fix FPCommandTool

Merge with MikeC's changes