fix issue 55
Merge branch 'master' of https://github.com/melanke/Watch.JS