fixes from windows
Merge branch 'master' of github.com:jove1/ae