Ran clang-format.
Fixed MSVC compiler warnings.
Fixed OSX build failure.
Merge pull request #50 from Fraser999/MAID-329_msvc_compiler_warnings_fix

MAID-329: MSVC compiler warnings fix
Merge pull request #51 from Fraser999/MAID-325_osx_bugfix

MAID-325: Fixed OSX build failure.