Updated Riovoolk, added general library for futher use