CountDown fixes
Lint fixes
Merge pull request #2 from nhaarman/feature_countdowntestfix

CountDown fixes
Merge branch 'dev' into feature_linttests