david's and michal's fixes
Merge branch 'master' of github.com:majek/idea