FX-103 windows build fix
Merge pull request #23 from jzsu/master

FX-103 windows build fix