fixed Case #147
Merge branch 'master' of https://github.com/sioLabs/gcdc_final