better cross platform support, see changes in notes.txt