CBashir - 1.0.0 - Bug fixes