Fix #25 - Version 1.0.5