Added support for Windows/Linux, fixes #4