Finish me,fixes #3

ok?