Fixed #14 [Part One]