Konrad's changes
Merge branch 'solon' of https://github.com/ozimek/r