Merge pull request #122 from ngaut/master

Stop ticker when return from drain method