Windows fixes+omero config

PRs #49 and #50 with a one line conflicts fixed.