Merge pull request #486 from jbrodman/master

Add check for Enum type in Assert
Adding new line to error/warning message on Windows and fixing some typos.
Minor indentation fix
Merge pull request #487 from dbabokin/win_output

Typos and formatting fixes on Windows