Bug fixed: Merge Jegerima-Ruben | Version 0.2.05