fixed compile errors
Merge branch 'master' of https://github.com/peterxie/StretchIt-Beta