some last changes
Merge branch 'master' of heroku.com:korrelate
wrap modifications