Bug fixing: gem, ...
Merged changes