Committing Jeff's changes
Merge branch 'master' of github.com:rll/raven_2