Small changes done by Rubin on David's computer
Merge branch 'master' of github.com:davidbrazdil/dexter