Update ticket 2

fixed #2 working