Version update with Sven's changes