Fixed bug and Adding whenever
Merge pull request #20 from kengos/whenever

Fixed bug and Adding whenever