bugfix & gem rename