Merge pull request #8 from evoskuil/develop

VS build updates and change to enum type.