Merge pull request #59 from mfsv/develop

Beautification to remove MSVC warning 4800...