Added more pre-requisites for Windows and MacOSX