bug fixed.
Merge branch 'feature/gw'