Compile fixes for windows(?)
Workaround for window min/max macros
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer