Added different cases for Linux and OS X