First version
Merge branch 'master' of https://github.com/rajksvn/rajk
to make this work