Merge pull request #508 from huitema/master

Fix use of bitfield unsupported by Windows compilers