Added my changes according to #23