Update based on RoTorITs version spring 2013