Merge pull request #1 from ipa320/master

update
RSI cleanup

long have we been waiting to clean this up a littlebit, not tested yet
though
Merge pull request #3 from ipa-lth/master

merge rsi and xmlkrc