when to end
Merge pull request #30 from rw1993/master

when to end