Added OS check issue #22