little fixes
Merge branch 'master' of https://github.com/Arnatar/ideas-papo2014
compiled