refactored to remove an uneccessary math.exp that was causing problems
Merge branch 'master' of github.com:JoFrhwld/FAVE