Fix for TIM-572
Merge pull request #4 from yokose-ks/gacco2/master

Fix for TIM-572