Added multi-platform compatability.