Added CYGWIN define
First attempt at incorporating Android changes
Merge pull request #2 from adam-p/master

Incorporated Android changes