v 1.0.1

fixed a bug that caused the resume method to not work if counting down
Merge branch 'master' into gh-pages