Fixed version string
Added missing include
Merge branch 'refs/heads/master' into cygwin