Merge pull request #190 from pffang/master

WinCE Compatibility Fix